Check that the widget is viewable. (#336200, Bastian Nocera)

2006-03-27  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmnemonichash.c (_gtk_mnemonic_hash_activate): Check that
	the widget is viewable.  (#336200, Bastian Nocera)

diff --git a/ChangeLog b/ChangeLog
index fd9e4cc5c2ebb9b6441513a4cf171a476adaa6c4..89460dd916f7d10e6c617a17aa2b812051f37e47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmnemonichash.c (_gtk_mnemonic_hash_activate): Check that 
+       the widget is viewable.  (#336200, Bastian Nocera)
+
 2006-03-27  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkmenu.c (gtk_menu_scroll_by): bail out if there is no need

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fd9e4cc5c2ebb9b6441513a4cf171a476adaa6c4..89460dd916f7d10e6c617a17aa2b812051f37e47 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-03-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmnemonichash.c (_gtk_mnemonic_hash_activate): Check that 
+       the widget is viewable.  (#336200, Bastian Nocera)
+
 2006-03-27  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkmenu.c (gtk_menu_scroll_by): bail out if there is no need

diff --git a/gtk/gtkmnemonichash.c b/gtk/gtkmnemonichash.c
index c9f38408c8ac383c0e1bd91e2429e5267fe2d396..705484aded416e9677cef62d6fb50f032a2a21ea 100644 (file)
--- a/gtk/gtkmnemonichash.c
+++ b/gtk/gtkmnemonichash.c
@@ -127,7 +127,9 @@ _gtk_mnemonic_hash_activate (GtkMnemonicHash *mnemonic_hash,
       widget = GTK_WIDGET (list->data);
       
       if (GTK_WIDGET_IS_SENSITIVE (widget) &&
-         GTK_WIDGET_MAPPED (widget))
+         GTK_WIDGET_MAPPED (widget) &&
+          widget->window &&
+         gdk_window_is_viewable (widget->window))
        {
          if (chosen_widget)
            {